git merging

join shbcf.ru